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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c9ca8eb4a1 -s ours am: c3be918eb1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0b64f34df -s ours am: 9a1b5688c1 -s ours