Make use of MWQueryInterfaceBuilder

Change-Id: I4eca491e66f306061a60713753fd36be4fd2c817