Merge "Import translations. DO NOT MERGE" into nyc-dev am: fe279b5016  -s ours
am: 8da383953e  -s ours

* commit '8da383953eb01f793a3aca8623735470a74085d0':
  Import translations. DO NOT MERGE

Change-Id: Ic6d15de4e4c84d8e94f093e1ef75a355e3a175f0