bug# 1198890
internal api tidy

Change-Id: I1b6d843eba5bc9f3a793f28392d0b675333cc17a
Merge "bug# 1198890 internal api tidy"