Keep PluginManager reference to avoid NPE
am: 5d378dfeac

Change-Id: Ibe4591fbf787f4fd6781a7927728db394735d9e8