Merge "Removed usage of hidden APIs"