Merge "Update power menu + dialog" into oc-dr1-dev
am: 1e6b7d7b15

Change-Id: I2a56a751b123213e53ce4124129634a916804e04