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

Change-Id: I7414e3510ce29720a40a55c8dbd69c9a34be6d45