Merge "Import translations. DO NOT MERGE" into oc-dev am: a980312a -s ours am: 9f05e68e -s ours am: 8a18b567 -s ours Change-Id: Ife31a8953c068fd71096d96c2ee306dcfc5d8bd2