Merge "Remove usage of hidden APIs"