Merge "Do not chmod ANRs" into main