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

Change-Id: If56de402cfaf73f7ac75e1253b79345e58bc1710