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: d5473a08
Change-Id: I5306cb7a1e8e9b3a377922285cfec5682ee3ed63