Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 21d0a2edbf  -s ours
am: fb67d91d8e  -s ours

Change-Id: Ib9279a49fd2ae73710af7da9f13ab0fb767ea4c2