Add more logging to track down b/17708011

b/17708011

Change-Id: I0d6833ddcc9c76d37c2be0616a8daee36f4fad23
2 files changed