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: Ibce37f648f7dca60466e8c64c928f141dd640932