Merge "Do not enter hidden API slow path when policy==Disabled"