am 1b4a9b41: am 5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev

* commit '1b4a9b4107c1d6ba5b2ecf5657865acc24a28686':
  Use string resources instead of literals for backup password confirmations