am 12c7f185: am 9facc23c: Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev

* commit '12c7f185e30d760eb3788ae4de49b5f37b22d258':
  Move UPDATE_INTENT to SettingsInjectorService