Merge "make requireSimCredential() public API"