[automerger skipped] Merge changes from topics "caps_refactor",...
[automerger skipped] Merge changes from topics "caps_refactor", "phone-cap-revert" am: ab5ff503 am: 2ec3b715 -s ours
am skip reason: Change-Id I2412936bb5e2c4f41922c1accca4f93d8f3db13a with SHA-1 c3c6b424 is in history
Change-Id: I404c42f58321e793f2e4463c51f21e21c2084a2b