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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b309a89e4a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 900e1aa57b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6e7ddc7ee9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 684f6fe662 -s ours