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

Change-Id: Ic57af16f3f3fbbe209e1fc5fd5f13c7c8ad8117d