Merge "Removal of usage of hidden APIs"