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

Change-Id: I35f04bc8e5b78c1f06b67745fdb5a4bfdfdaeee6