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

Change-Id: I8bcfd139861eb4ca6a0943e321b8032245e27a42