Merge "Import translations. DO NOT MERGE" into oc-dev am: 5957e13822  -s ours
am: 506fcc3a9d  -s ours

Change-Id: I04a0fcb0e52142c8e323f9d12514394d6c3f3b4c