Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 85c61142ab  -s ours
am: 968e1d93f8  -s ours

Change-Id: I904eedd10519adbeababb8aff682d086dfa0f6b0