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

Change-Id: I5b0b3e17d14a5d86a2b7296f385e947f30cd3332