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

Change-Id: I22381a4a7bc572765718c6003769431b0974567c