Add Falcon to the mix

Change-Id: Ib199b4ca9f8b99374f665ed688f7199ffefd8ac2
Merge "Add Falcon to the mix" into du44