Merge "Hold a wake lock when taking bug report"
am: 8536c373fc

Change-Id: I3d34d5f4ae8652701017675c55d432f4be711dca