[automerger skipped] Merge changes from topic "apex_adb" am: f64909587b am: 2d03586435
am: 110abbf49a  -s ours

Change-Id: I223936e3c8868e409fcec819b1341ac0a3d3549f