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

Change-Id: I335191d70ae5fe79fe7d1ea9c334ecd6d82a60e3