Merge changes from topic "am-53102a89669442acb2f5cb33367bdeba"

* changes:
  Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94 -s ours am: 9e020b5d -s ours am: fcf5908f -s ours am: ee579281 -s ours" into tm-qpr-dev-plus-aosp am: f54d0819 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94 -s ours am: 9e020b5d -s ours am: fcf5908f -s ours am: ee579281 -s ours am: 1c1c06e0 -s ours