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

Change-Id: I0c2e94e311da66ef58e6816ef20c9f8eb5020528