Merge "Remove TODO related to WakeLocks" am: 12d08bf9a0 am: 069bb850d8
am: 8a119594ea

Change-Id: I9c44d3dd6682d4c7e8e1c65afb9e99546eb8217e