Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 215a5d0a53  -s ours
am: dffcf9beaf  -s ours

Change-Id: I8e3ab34809e7384df6bfef887e0d1840f0fd356e