Merge "Set /sys/power/wake_lock permissions on init." am: e75c6c841b
am: b00894dc64

Change-Id: I2e3cbbb520fb9451e77ebbe78c3642a2ef152583