Got scanning working!

Change-Id: Ia0dbbf1103569fa3be1ab992f5c0cc50bc4183ee
35 files changed