Merge "Remove unwanted hidden APIs"