Merge "Hold a wakelock during dumpstate." into cw-f-dev am: a2cc07e7ba
am: e36aa0da76

Change-Id: I8dbb22763f53c23ce64fcd51ea3607a1be5d80d8