Merge "Import translations. DO NOT MERGE" into oc-dev am: f262018755  -s ours
am: 759445f009  -s ours

Change-Id: I7ae2c7b42fd6ebec996565ece6bbdc9c4d4a5d1e