Merge "Repair SDK-app property for users"