Add combo scan

Change-Id: I7a71a9a0058a22f17f87b48adc7e140ee66571bc