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

* commit '8e9aca37c6045aeffe83f13a0664cb950a7f7fef':
  Use localized name for guest user