Merge changes from topic 'adb_perf' am: 42aa9a1415 am: a028b94b4b
am: 082ac40439

Change-Id: I25e052d39b54b575efec8f9db198410ca3f17968