Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 197da1f978  -s ours am: 5501036062  -s ours
am: 01c4a57a8d  -s ours

Change-Id: I67f5883bf640d5176c74156e9b2d82390029d0a1