Merge "Dumpstate should hold a wakelock to save bug report time." into cw-f-dev am: 64076bac3f
am: da023f180e

Change-Id: Ibc0b375df6a8cc42689f15bde7ad1112c0140ecc