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

Change-Id: I1a62177a57a91e89c14b5955f4946fc589f2704d