Merge changes from topic "updateStrings"

* changes:
  Add getString override that accepts format args
  Add APIs to allow updating enterprise related strings