Merge "Remove TODO related to WakeLocks"
am: 12d08bf9a0

Change-Id: Id94118a9b687493f6f6879bf6bbe23cfad86dfa9