Merge "Fix testApplicationRestrictionsManagingApp unit test" into nyc-dev