Merge "Change RRO enforcement logic" am: 9c683dc968 am: 1876c3698d
am: 95f16d563f

Change-Id: I65ba9497a94dd31c1b4d0a525552d5fe738d7f17