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

Change-Id: Id37f64d7f63a0ca86353fdee18379309e4359810