Commit cf34df857273d3be289e00590d80498cc11149ee broke the plugin. Change-Id: I94f7828b6cbb0ca9ee069666fbff77425e4a868c