Merge "Import translations. DO NOT MERGE" into nyc-dev am: fb9e8e3188 -s ours am: b925300049 -s ours
am: 9ce91ecb0f -s ours
* commit '9ce91ecb0f0837307b91206d02333cac5990d2d3':
Change-Id: I2c9506023e1d52ac11b37b36c9b223147b45aa14
This commit is contained in: