Merge "Improve debug logging of classes for 77342775."
am: f27558735e

Change-Id: I86143e94c932cb44c41c43cf40b927ca83ae005c