Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d48502972a  -s ours am: 250e262f6e  -s ours
am: 6dc6dc0e01  -s ours

Change-Id: I224c430dc790cb761b95a67c17fbe2552760394b