Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde91384  -s ours am: cccb304acf  -s ours" into oc-dr1-dev
am: ab60d6b44e  -s ours

Change-Id: I887e494fc178972d6941f5c8cbfe64fb0109dd0e