Merge "Themable volume and power dialogs" into oc-dr1-dev
am: 59aadea809

Change-Id: I191fea7efeae05fab885dcb91fc67ea5e54ec147