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

Change-Id: I8da6418636bc11f64c226c8c3d995f7440ed04f7