Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: f15c825dfb  -s ours

Change-Id: I88443420743364bf148b0200e12efcf27cc92df3