Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 5fa976b741  -s ours
am: 627c44ae87  -s ours

Change-Id: I144a3b1d2c310b0d24b297d7850f4f243675b293