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

Change-Id: Ib1703d3660fe7d47eb4ce1630fecb6b7b67d39d4