Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb8c569414 -s ours
am: 977d5bbfd2 -s ours
* commit '977d5bbfd2f67d18978ab55fbf26cbcfc282283e':
Import translations. DO NOT MERGE
Change-Id: I85443596959d0cfd85225f2aa3c336eab2c042e4
This commit is contained in: