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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d69f19c9 -s ours am: 77947a99 -s ours am: 83fb70b5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f32482d0 -s ours am: 4da3116d -s ours am: 2eddca31 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1e7e1844 -s ours am: 63d6e269 -s ours am: ec3f5399 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0cb68093 -s ours am: 02a083d5 -s ours am: ed50db98 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d4053e03 -s ours am: 639a014a -s ours am: b3bb5acb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f83f62f6 -s ours am: b1281138 -s ours am: 48bdacaa -s ours