Keep PluginManager reference to avoid NPE am: 5d378dfeac
am: 75eb1d78b9

Change-Id: If0a1779a70ee980cf78ae868a174f07b474e00d5