Merge "Revert workaround for A77 erratum 1800714" into integration