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

Change-Id: Iae4a06954f780fc18c9089cf42e2802d958a9ce4