Another debugging checkin for beta cluster

Change-Id: I96e79fbcbd18fc4867b819c42747a54f506d5b1d