Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602  -s ours
am: aec51f497c  -s ours

Change-Id: Iee66d395f034e3898ca805e4e7d6be141aec17bb