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

Change-Id: I86ca91d78a60b0ec9e595a3be79de92d06f73d5f