Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5854f2aa07 -s ours
am: 3551359739 -s ours
* commit '3551359739c760a58fd83179e495b030aea2de83':
Change-Id: I03ef37f09d0779319d7690e056744bc6eb4ae69d
This commit is contained in: