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

Change-Id: Ic85dc86d7a701965313ee8a7f6ce50ab0c1a02ee