Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: fab6fa3164  -s ours

Change-Id: Ib7116e8c5a146de8cac0a1cabdb5d458fbdc6fd8