Merge changes from topic "am-7d13f9b473c743eaae369a3946da2a24" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8089ee68 -s ours am: 21d61f27 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7aee397d -s ours am: 3e11ee75 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c764b4ac -s ours am: 8e9e3128 -s ours