Merge "Enforce RROs for all the build-time ROs"