Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 496d17f748  -s ours am: 0f106f5744  -s ours
am: 28a2a4fe44  -s ours

Change-Id: I3a6b55feebc5c03861629eb035be7934375ddfd2