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

* commit '7ff9f2b488e4017c7b3385fb067a14cfc07764fb':
  Update power widget icons and fix location behavior Bug: 11242129