Merge "Restriction setters were not getting called since we changed the boot sequence for multi-user model."