Add more debug logging for beta issue

Change-Id: Id3b898fa98839a92b0bdb7f0f7f4508991958160
Merge "Add more debug logging for beta issue"