Merge "Fix NPE in WakeLock#finalize for unit test"