Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 125deebf5d  -s ours am: 3b99360472  -s ours am: 77323eb2bd  -s ours
am: f38a9f357a  -s ours

Change-Id: I71da3d656c18fd3f567d61f38ba40e2df5b97ba1