Merge "Final tweaks to power menu" into oc-dr1-dev
am: 0a2ada5416

Change-Id: I2f19770417a30863f99675820908623eb7a8cec0