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

Change-Id: Ibbdb7922b216c0c3ffeeccd1b2a02a8a8841ac47