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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7ba24097 -s ours am: a435d937 -s ours am: 26b94569 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2a577fb7 -s ours am: 7553566d -s ours am: 0e60025f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a4a9743f -s ours am: 3d50fe82 -s ours am: 6b06b6dc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b08ae27 -s ours am: efe01d48 -s ours am: e5e20578 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: edaa622c -s ours am: ebeec301 -s ours am: 83634b35 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 03e17aca -s ours am: b5b94115 -s ours am: d8216e89 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b8c0735a -s ours am: 35c6027b -s ours am: cfc9382b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3870fbd3 -s ours am: 15e09774 -s ours am: 71e58282 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 88dfba3a -s ours am: b2362e5b -s ours am: 3f1957f3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4890b595 -s ours am: 46e2f793 -s ours am: 4964eab8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b276a264 -s ours am: ba820fdf -s ours am: 954bad78 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c144d13d -s ours am: e4ac1d8d -s ours am: 9999b52c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e0a0fefc -s ours am: beb2706e -s ours am: ff1f3efb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee471092 -s ours am: 70c40393 -s ours am: a00e8520 -s ours