Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: c784df5b41  -s ours

Change-Id: If18d415be398894d4bea03cee7ced019a672baa2