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

Change-Id: I5ee9264a116ad1ebd0b5b6d305e10fa3a1c3a77a