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

* commit '6e1f3bddc7129dc9de2ca00a412af3589e023704':
  Import translations. DO NOT MERGE

Change-Id: I6b228645382dd263b8fccd29652b09f2bf8f12f3