Custom boot image fix

Change-Id: I6d8c8a1c98d19b15eb6199e11fefa5f48da43571