Fixup inconsistency due to change in Plugin loading requirements.
am: 3b08bcce2d

Change-Id: Icb2217f6bc4bca2b870a4557878e4d52a9e5bd5b