Merge "Allow shell to acquire wakelock." into cw-f-dev am: 0712525f13
am: aa09bef939

Change-Id: I05f2e00cf26e886840ccc2491e7987fcaa4d36b2