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

Change-Id: I52250d3d480d336955ed44796cce46b03a6c8b4a