Do not use LazyPluggable

LazyPluggable was removed but was not replaced in
all places of use.

Closes-Bug: #1394641

Change-Id: Ie5bb32e409a6abce0509adb6e035c533547bb1f5
Merge "Do not use LazyPluggable"