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

Change-Id: I8f5582ce59b97e31f2c74d53c82d8502d12a1da6