Merge "Remove non-test ScopedWakelock dependency" into rvc-dev am: 24087f1219 am: a76d3722bf am: 06bcc0c521 am: b9aef44c39

Change-Id: I5e23eb768c7270281c1eda7ab799cc776623ecf8