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

Change-Id: Icecbe08a02becf853f28ad03085e11cdfc108cd6