Merge "Remove unsed wrapper method"