Merge "Fix isUserAddedCertificate" into nyc-dev