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

Change-Id: I6494116337bd418e34a2b532a5b8fe25e1f19f41