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

Change-Id: I64c849823281500fc8b9ecf760e162d1a2a92d65