Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899  -s ours am: a42bca8  -s ours
am: 158c390  -s ours

* commit '158c39011d2e10a72e6517228ce7e93dd1e54b23':

Change-Id: I1c361d14fe1b4742a4d925449d8ea88bb08aead3