Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 880e823e9e  -s ours
am: 6d2c9c29dc  -s ours

Change-Id: I86e6e8da3aeba36ad82666c08567932151afe62c