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

Change-Id: I6df27fbf95cc22ef8988730a1d7f244949fa838c