Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7f1b86e5df
-s ours
am: 35fb0fb796
-s ours
* commit '35fb0fb796a3a055002962ee0e1dced5b1e2f856':
Change-Id: If95b92b560dcd97280a1dcd009df87c8786316df
This commit is contained in: