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

Change-Id: I9dc4dc4f9af82ecb8cd20acd3eb13021d25375dd