Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: d6498d1120  -s ours
am: ce600b4e12  -s ours

Change-Id: Id9977bf5bea6d1e790f40652bc5abde18eda9b14