Merge changes from topic "apex_adb" am: f64909587b
am: 2d03586435

Change-Id: I217e06b2e131e6eb3f21c6f25207699f9b15b28f