Merge "Revert "Temporarily add debug logging for b/31357497"" am: 7b414bac4b am: d319157b4b
am: 71568c47ee

Change-Id: I1780224924b579e644bbddfc128266672954ca38