Merge changes from topic "apex_adb"
am: f64909587b

Change-Id: If241fd30597248d5c34be0e550feaf50850e46cc