Merge "intel: Change boot source selection" into integration