[automerger skipped] Merge changes from topics "caps_refactor", "phone-cap-revert", "radioconfig-revert" am: 48da0e3fe2 am: bc965dd1ad -s ours am: 6d802cba02 -s ours
am skip reason: Change-Id I2eb83fd2356134ef45a782d99174fdd65f8c5a13 with SHA-1 3639471c93 is in history

Change-Id: I07e3b47fd2a5e0c3536034ff01d5f9278d427f68