Underp the Underp public API... again

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