Merge changes from topic "adb_bp" am: 9ee373ac2c
am: ca6ec5c48b

Change-Id: I1a9a4bc92bf48d1d0af6bf74f6f84d20d43d10c9