Merge "Allow shell to acquire wakelock. DO NOT MERGE." into nyc-mr1-dev