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

Change-Id: Ib2a61f321ebecc23b892745232f2dfd22b96e6de