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

Change-Id: I90228fc55681b74718f24b6be007c5db31c8e058