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

Change-Id: Ia4b841e5b804c887d6c381d6d2e500a82509fac5