Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: cc67847367  -s ours
am: 63d528b12a  -s ours

Change-Id: I0a874f889cfa9cc41fa496df1e94e1bc17d206d5