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

Change-Id: I9bad21540a164d20eeecf6f5868312f94e8e1839