Commit 0e5c3fa44d72fef56346d1cdd2426aa6fe3a3475 broke the plugin Change-Id: Ib4002535820ee54a54b5ae48d1f6fbb8eac33205