Add fixes remove Bootfromvolume

Change-Id: I1aecaa77c1edd4f2725f494101d8eaf6c13120db