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

Change-Id: Iec8c0e5e73100ebd98e09ac488684266796573b3