Merge "Enforce RROs for all the build-time ROs" am: 4b4e203a0b am: 2f92aa78f4
am: c04f526b9c

Change-Id: I9fae908eaa40fca7e8cf0de23fcddcba2968b427