Merge "Passing additional parameter to powerctl" am: e0ab2557d4
am: 0c146e6572

Change-Id: Ifd007a10f0a352cb86b61f22608d382696331544