Merge "Don't leak wakelock instances" into nyc-mr1-dev