Merge "Remove TODO related to WakeLocks" am: 12d08bf9 am: 069bb850 am: 8a119594 am: d0f9779d am: 197f24fb Change-Id: Ib1703d3660fe7d47eb4ce1630fecb6b7b67d39d4