Merge "Fix issued with non-public interface methods." am: 31b66aa
am: 6c3ce7a

* commit '6c3ce7a7aca25efb0cb2e9b5ea29b82a014e050e':
  Fix issued with non-public interface methods.

Change-Id: I27eaac567e296e4e940b2002725bf95a469edecf