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

Change-Id: Ibdcbfdd15957d4ca64ef2f1f084768e9241da27f