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