Switching to guard plugin

Change-Id: I4755bbdc0cdd1d96dfb58e00d727f532857acabc