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

Change-Id: I3065c252581016a9afafeaad83a315cfaf181504