am 7ff9f2b4: am b1ded62f: Merge "Update power widget icons and fix location...
am 7ff9f2b4: am b1ded62f: Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev
* commit '7ff9f2b4':
Update power widget icons and fix location behavior Bug: 11242129