Merge "Additional debug logging for bug 33231647."
am: 6afaa42f50

Change-Id: Ia828c033c0dc304ed95f27caf233a494fbfa92b4