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

Change-Id: I6aae813dae98315f588c0c76abe0c4377bc05a3b