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

Change-Id: I3ac8a2c9532682aab63b3500f960cb03e67fd8c0