[automerger skipped] Merge changes from topics "caps_refactor",...

[automerger skipped] Merge changes from topics "caps_refactor", "phone-cap-revert" am: 1bd0e487 am: e1d888d6 -s ours am: 38312720 -s ours am: a0160e40 -s ours am: 2b40b7e4 -s ours
am skip reason: Change-Id I17315f5b99ad7c5a5a6d88ed21a825301fa8e5e5 with SHA-1 a9667afd is in history

Change-Id: I4997a604719f9294a533186c8b9bd2213770a09e