Merge "Import translations. DO NOT MERGE" into oc-dev am: 21b5f4063e  -s ours
am: 5cdb654cbd  -s ours

Change-Id: Idab936d6add40ecb0a7940dde61af850c1a1a8ef