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

Change-Id: Ia8667cafa6bd5444781956939376f4689526f2ff