Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602  -s ours
am: aec51f497c  -s ours

Change-Id: I2f855bb13f287547ab5f42c05dada215465d0e5c