Merge "Import translations. DO NOT MERGE" into nyc-dev am: f9a6f33091  -s ours am: 54fd6701ca  -s ours
am: 5c7df93d1a  -s ours

* commit '5c7df93d1a648d26da61a8cc4dac6d6db270cf10':

Change-Id: Idfdfd9206ce67361b84dd09e06facd9e8abfb975