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

* commit '31b66aa845d7294846e549da54750e4d8fd24822':
  Fix issued with non-public interface methods.

Change-Id: Ieb47d07d1764e6942022edc510b7e1d94206d7b1