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

Change-Id: I2125118b568ea7d81b37a7c944d6c16d75742824