Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 93e807485e -s ours
* commit '93e807485edc5de8b549b7d5a5ce7e52f5315094':
Import translations. DO NOT MERGE
Change-Id: Ib8d00f5d63a48aa529393edc29c226c11824c476
This commit is contained in: