Merge changes from topic "am-b81a4115f8fa4d15bcbc4e5bc8733990" into udc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: b579025b52 -s ours am: 316ef8a49b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04d2f6875e -s ours am: a4a0946c97 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8266ad8ac4 -s ours am: e7db5a2156 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a37f6b565e -s ours am: 26ef6efb42 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7d1a8b7d0d -s ours am: 8e1ceff9aa -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d1f337cb9 -s ours am: 9a40c4a556 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 0e5984765c -s ours am: 3625363f8b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2e41046f7 -s ours am: de67808ae8 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 0ec12c079a -s ours am: 07981a1e15 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c0ba3a7fa1 -s ours am: ea4c94dbe2 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5b67b6684d -s ours am: 7ab73bcef4 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e5d34429a -s ours am: e6105710e2 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 05437238ec -s ours am: ddc3212946 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f7df85c9f -s ours am: 4e8e0ab4ba -s ours