This will allow plugins to use the functionality without having to explicitly declare a dependency. Change-Id: I92aa3bb2e77deef433a7f1262d8ad5bda59dd83b