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

Change-Id: I45ea983b0e0b32c397ce3613f4c8c42c6ce429c7