Merge "Merge "arc: Do not construct RestrictionSet with empty restrictions bundle" am: c386a39a95 am: 467d5d36d1 am: 1556cd3c02 am: f099b1b6c1"