Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 88e71ef -s ours
* commit '88e71ef15142712d6c5c4d6871afee1f88ce428e':
Import translations. DO NOT MERGE
Change-Id: I93ae38563d3303a2eab5957f8dbfd0740f580a92
This commit is contained in: