Merge changes from topic "am-4fd26709498342da93912fba9cfb0331" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a9ca2898 -s ours am: d8ba8bbb -s ours am: ec4b1a5d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f9d0f57 -s ours am: f4ddd189 -s ours am: af244deb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8969cbd8 -s ours am: 46a53b93 -s ours am: dd0d779f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7228d548 -s ours am: 4e05b640 -s ours am: e1553404 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfc901e6 -s ours am: fdd1bced -s ours am: e6042db7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f45561 -s ours am: f0501071 -s ours am: 57ca8a3d -s ours