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

Change-Id: Ib2099e20656223d72578b92a147f6041d5531438