Merge "Fix <UCP>[Power] toggled the power status"
am: b3eeb859f7

Change-Id: I7f56ece79f0eb10cc27d5c62d1c8300933b1c23b