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

Change-Id: I8217d0c9f7ca6493177fd5560f00af2c44a3a4e2