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

Change-Id: I55d57573b65a54f6ff7a012c5dbe35e6d01f0c07