Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 096ea4c897 -s ours
* commit '096ea4c897774cbe4a49835ad28744564b62cd06':
Import translations. DO NOT MERGE
Change-Id: Ia31a39d281e040cf048290ac2e9c1b86efe3af1f
This commit is contained in: