Merge "Don't leak wakelock instances" into nyc-mr1-dev am: 121a9941d4 am: f411051195
am: 13934df5d2

Change-Id: Id3897494d95a3903d7dabb34387cc7d3173165bd