Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: dfe6e518a2  -s ours

Change-Id: I7fbd39eeaaba27b93ef40201096fcd09bd176700