Merge "Remove non-test ScopedWakelock dependency" into rvc-dev am: 24087f1219 am: 32d96a1852 am: 790cccb032

Change-Id: Iacad655beac77b3180244c4d39994cda792b55cd