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

Change-Id: Ia7fbae5bcde02b847425fe1b66fa2f97cc9b249e