Merge "Fix the use of WakeLock." into nyc-andromeda-dev