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

Change-Id: I10c9bfb5e9e22e565b29a1a6b6eda86c8c08f31e