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

Change-Id: I9f5da262411ec143ba3da9da0e5734d96dfa53b9