Merge changes from topic "adb_bp"
am: 9ee373ac2c

Change-Id: I120a5d3573afb08f4efbb94f047340572509bb06