Fuel Master and bootstrap in all cases Change-Id: I8f3ec01e927461c477c40bce40ae198f709bd359 Related-Bug: #1259118