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

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

Change-Id: I2fc2ddcb35e14bc6ad32740688e765b22ffb56c4