Revert^2 "Boot image extension."
am: 02820f4247

Change-Id: I02e16640b2541767d58dfdc3b554199f18e4b8b5