Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 438c3cbffe  -s ours
am: 545c97d0b8  -s ours

Change-Id: I4502b45acbe9c6e23f13bb8f2279bb31e8550cd5