Merge changes from topic "am-c55b732621e440a286c505ab0a3446af"

* changes:
  Merge changes from topic "am-c87b022de5ba47cb88def16514082657" into udc-d1-dev-plus-aosp am: 8bf75ae4 am: 592bf57e
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c78de62d -s ours am: 49547c44 -s ours am: e4961c38 -s ours am: 4ca51beb -s ours am: 98ce1049 -s ours