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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 06d22388 -s ours am: 3d3b43ed -s ours am: 7352c95a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 16026ae9 -s ours am: 2973e09d -s ours am: 3784ca14 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e965dfe6 -s ours am: a0be0c8a -s ours am: 17b3d8cd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dbaeaa5c -s ours am: 9fdf6d1f -s ours am: 6b17e15c -s ours