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

Change-Id: I14c44714c8f90d21136a546b32cea0415d67d8b7