Merge changes from topic "am-0bb9b88a883e47a48db0f1853073eaad" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3a075dee -s ours am: e870f7c2 -s ours am: b92c3de5 -s ours am: 7b86cdeb -s ours am: ca963a1f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 192e1926 -s ours am: bbfea0e2 -s ours am: a6a880ad -s ours am: b71b9231 -s ours am: 95f68295 -s ours