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

Change-Id: Id52f60a8932ac9c59f2b544db13ca2981a8e6923