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

Change-Id: I23ccfd584b5f88870625ed1d270885073da391da