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

Change-Id: I12bdb0e46f4401413a38b8b699e464929e88f504