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

* commit '72dada86c027a848ba82134ffa38040851b33882':

Change-Id: I25ae2df702a42b6e2fce7b1fe6eede2ef3350430