Merge "Remove the hidden API access from common shim"