Merge changes from topic 'adb_perf'
am: 42aa9a1415

Change-Id: I56b73a99b05634164379c700be9bdbd0a98c39c3