am 7ac21204: Merge "Use localized name for guest user" into mnc-dev

* commit '7ac21204e16c797cc4f818ccc51509d425ffaf80':
  Use localized name for guest user