Merge "Temporarily add debug logging for b/31357497"
am: 54aaba2420

Change-Id: I3f2741c058832f413fa28f1ef342f1a8f13ce6df