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

Change-Id: If4759dfe86ce2e9dd89eea01fcb71082a9585327