Merge "Passing additional parameter to powerctl"
am: e0ab2557d4

Change-Id: I9afd4fe2a0c8c1c9de9da7ca1758f4cba6d38a72