Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-mr1-dev am: e4ae0a88c0  -s ours am: 692737b238  -s ours
am: 89009352ed  -s ours

Change-Id: I70137c4560d36f1bc67bb19779a50962ca2366e5