Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c  -s ours am: 1bef62e488  -s ours
am: 166d6e9254  -s ours

* commit '166d6e92547de8985f131dd82db529a8ffe6e67a':

Change-Id: I6eaef955158660328093e65ad1fe1dd3effc3047