Merge "Hold a wake lock when taking bug report" am: 8536c373fc am: 8f660f5f77
am: 2788b5eaf3

Change-Id: I21033256e629706780a41f0b8dbbb97458903adb