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

Change-Id: I848d0de6cc6b6bcbbbb9643900b3c29df7576fa1