Merge changes from topic "am-87bc6609ac824e55ab12cde27de16be6" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a9ca2898 -s ours am: 1e653ead -s ours am: 06017b53 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f9d0f57 -s ours am: f0baa56a -s ours am: cd84d42d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8969cbd8 -s ours am: da049e62 -s ours am: 11c21431 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7228d548 -s ours am: f40638ce -s ours am: 5fceb6ad -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfc901e6 -s ours am: ea4821f3 -s ours am: e7a28ae7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f45561 -s ours am: 585d4436 -s ours am: 449370c0 -s ours