Port disambredir.py to core

Change-Id: If6cb976cd47675ff780f49029f5fa5277b9fd95c
Merge "Port disambredir.py to core"