This avoids messages about undefined variable on master log Change-Id: Ibecc364589f8e6eb047a727d483697c42a32f0fb