Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 36db49ecbf  -s ours" into oc-dev-plus-aosp
am: e4cc75de2c  -s ours

Change-Id: Ibf414074c4f9ee3d69464387a53b8148516e86ca