Merge "Fix MixedProfileOwnerTest#testApplicationRestrictions" into nyc-dev