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

Change-Id: Iabedf9ff2c7c4d712b41c71b24e312ff697be737