Merge "Import translations. DO NOT MERGE" into oc-dev am: 63d52ca6bc  -s ours
am: 63ce39cfe6  -s ours

Change-Id: I3c36011aff2035d32193ab7c3b73e4036af9280b