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

* commit '54fd6701caea2f9471b7fd16e93ab5fe0d75da2d':

Change-Id: I8cc20393d26a06a25aa565241b31099b782d026e