Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug...
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am: 7781eccb am: dca861e1
am: f97bd913
Change-Id: Ie01cd86bfb242b2e02ba55ecffad9c99a2ab962b