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

Change-Id: I9f5691676e193d827951af143c6af4e3e3455064