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

Change-Id: I73c561b8470cdffa766461a9c65260b30f7840bf