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

Change-Id: Ifeb849460ba1e1223233911170c5c8ed9334c007