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

Change-Id: Ib329b5874cd43a8079f7c0cda2777f5636a89b8b