Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 40758bb7d2  -s ours
am: 7a2497c1d0  -s ours

Change-Id: Iacb511030a1f4983ec37d5daecf425fa85eb601c