Merge changes from topic 'adb_perf' am: 42aa9a1415
am: 14e71a4af2

Change-Id: I7d5accf6fbd922b82c711d15684c2b29cbeb7002