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

Change-Id: I7687c791ffdef1bf12277119b5b9d49bd4f12118