Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93e807485e  -s ours am: e4872d1849  -s ours
am: b9e8801f85  -s ours

* commit 'b9e8801f85368ab8ac6609531d39c14612d61602':

Change-Id: Ie88ff1070f2ebc3407ab468f1a406f29ffed1867