Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: b8e046a8a2  -s ours

Change-Id: I7a06f41a928e47341a0767a0c65d2c45af6ddef6