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

Change-Id: I986c9389991effc7fe151d7e915395366287a0e4