Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 862f109dd5  -s ours
am: fd1e142b8a  -s ours

Change-Id: I040d0eeca401f1801396a160ce4bbd5a35b831d0