fe643776c1
This is a MFC of r261897 and r262000 and should allow all of the atf tests to pass.
This is a MFC of r261897 and r262000 and should allow all of the atf tests to pass.