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

Change-Id: I0b5f925a90f986418c7b681b3e41bb433ebc6b38