from internal git commit: 2bccf1a6d5d71a9bfc01d8f746dea73dacddca4e Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
From internal git commit: 9a5104340a1e9fe80240546cc3d0975fdeaa8e06 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>