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

Change-Id: Iba693915d702702b0bd71e2fb58521e66ddd9aab