Merge "Revert workaround for A76 erratum 1800710" into integration