With MOS 9 and later, this should be handled by Fuel automatically. Change-Id: Icf94641db4af83ad57d849b24a0c9634dab1ebd2