Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541  -s ours
am: 0b9b896202  -s ours

* commit '0b9b896202b58db23a2cdb21bc59cfe1bc1137a0':

Change-Id: Ie0cab532b3ab7f28e6bb23cde3fcd171f63eca2d