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

Change-Id: I89baf944f081b6237ba6253feebd45d3f3a42b09