Merge "Import translations. DO NOT MERGE" into oc-dev am: 88ab6c1304  -s ours
am: 8c53d24399  -s ours

Change-Id: I13211570b6e817af73bade9bd26828b833892377