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

Change-Id: Id91875154bfed187423abe8c5c53605d4e0868c3