Underp public API... again

Change-Id: Ibb8d74cec9de3c2227451d33f3fe4ce82a731514
Merge "Underp public API... again" into kitkat