Merge "Merge "Revert "Import translations. DO NOT MERGE"" into oc-dr1-dev am: 2dc7e093b4 -s ours am: a8d17297aa -s ours" into oc-mr1-dev-plus-aosp
am: ca5177297c -s ours
Change-Id: Ic71f001b01397c9dbeee72643ea04c32d4894c3b
This commit is contained in: