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

Change-Id: I3364c6eccecc274568d48f207c59be97ae78b1ce