Merge "init: handle sys.powerctl immediately"
am: 14ed55bae8

Change-Id: Ide932edcca1b076665448e465a785abfc1a1cb4c