From internal git commit: 501adf8bb60cd0a75c4a3e3ed0f608697caa3b77 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
From internal git commit: bcb1a6a525d92c69eee29c734b0d9c050214e7ce Signed-off-by: Alex Deucher <alexander.deucher@amd.com>