Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9da0a744c5  -s ours" into oc-dr1-dev-plus-aosp
am: 7945f44af0  -s ours

Change-Id: Ia2237a3bce35c67be416f393bd1c1933be3f7dff