Add combo-scan support

Change-Id: Ie856788188fc70379f4e1e7c8f05c38a15fbb72e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
5 files changed