Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 3623134476  -s ours am: f9ca194dbe  -s ours
am: b56b616c1a  -s ours

Change-Id: I7e18b80d8d64411e1783b63159452d8204f5906a