Merge "Import translations. DO NOT MERGE" into oc-dev am: 4414109220  -s ours am: 46181531ec  -s ours
am: c03209d495  -s ours

Change-Id: Icdad97761639fac03173c8a597f2d7e1739c05f3