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

Change-Id: I25e052d39b54b575efec8f9db198410ca3f17968