This is to make new functionality available to plugins and other consumers. Change-Id: Ic49a928f26a368c7119e96b0d809da6c9721c672