Merge "Import translations. DO NOT MERGE" into nyc-dev am: f2a87aa  -s ours am: 72dada8  -s ours
am: 0a3227a  -s ours

* commit '0a3227a26c58b5ed6d9772f6cd782fa4094c6111':

Change-Id: If494732d1b5a4e5797d8aa92de180aee3c02e67a