I would have liked to kill this whole interface but it turns out that despite
it being not published it is already being used for essential functionality by
3rd parties. Oh well, that is of course exactly what to expect with something
explicitly marked as "experimental".
Change-Id: I38716a23580313d955ae6bf09dfbcac519a7fb4e
d4a953e574