Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 242fb58d7b  -s ours
am: 849a3b7c86  -s ours

Change-Id: I3824f0f21ab9b55f696794688dd0ba5c889215e4