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

Change-Id: I308a4c01e23b081a4e4efdc74571e3c8ea846c77