DO NOT MERGE: Deprecated 'adb bugreport' with flat files. am: b3239728bb  -s ours am: 91375a8e4e  -s ours am: 06dd6a87ee
am: b9997a530b  -s ours

Change-Id: I16a52e8fdd4b938d33a3a46f7faa73406d222020