Merge changes from topic "am-35f3abdcff60461f9f40c6e1f2b745c5" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4c916d0b -s ours am: 45dcf8e9 -s ours am: caf62aaa -s ours am: 17002fd7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3804ef39 -s ours am: 71852ff2 -s ours am: e88fe819 -s ours am: 744e5aa4 -s ours