Merge "Fix issued with non-public interface methods."