Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d849122bbb  -s ours
am: e7bdd3679c  -s ours

Change-Id: I0e7e7ccc36bb09246869c9eb7c4351ff44888458