Merge "Remove hidden APIs usage regarding to dump"