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

Change-Id: If6c021da22e075ee166c8c6074e4d26ee668c18d