Prepare for UEFI support that will be finished in follow-up patches. Change-Id: I18d034239edd3d49ceedf281b48a650e6011bab4