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

Change-Id: I006e62e81156ba31dc245fee9bcfbea43edd71b0