Merge changes from topic "am-714039f3cfd243eb98aff7d30946de12" into udc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1a0070030b -s ours am: a0d220745b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e98b7d22e -s ours am: 9e4079d2f0 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bde2b96434 -s ours am: 37a4cacc98 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3983032dbf -s ours am: 098ec9eb0e -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2d8efd5e60 -s ours am: a151d777ce -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 954bd17164 -s ours am: 7a84f68739 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a4c401af95 -s ours am: c6979a4d5d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 45e7c44827 -s ours am: b60d07862e -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1fc95fcdb5 -s ours am: c66a473234 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6496ea2e34 -s ours am: 68dfa1d535 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 563d092084 -s ours am: 3d1dbf994c -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d4324e694e -s ours am: b20dc9c4d8 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7bd94ae84e -s ours am: 9e56152ad8 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ba72995f9d -s ours am: e3052d255a -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: abbbc229ae -s ours am: ea9d245208 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6b9b6d80d -s ours am: 1974d3d75d -s ours