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

Change-Id: I82af77457e13bd0d5a56099c80987d37c79ce752