Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 273bb516ad  -s ours

Change-Id: Id0870731ec3a6b1e10a413bcd0f1e74178a55271