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

Change-Id: Ic6fdc6b4e0d49347dce15511858717a13eb1c40d