Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5  -s ours am: 1018a5d4a1  -s ours am: ae4dc78421  -s ours" into oc-mr1-dev-plus-aosp
am: 9ba5681aec  -s ours

Change-Id: I43bac3255871563f4126d119d068cf2f9b1f56e7