Merge "Import translations. DO NOT MERGE am: 28b67f8eea -s ours am: 9839965b25 -s ours am: 7e05669aba -s ours" into oc-dr1-dev-plus-aosp
am: c33abb73bc -s ours
Change-Id: I595fc1bbe2235ffcb5809423d94f89383ae82976
This commit is contained in: