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

Change-Id: I8e98fdb1fe91dbec73bbc11702e7a37ebe989001