Merge "Adding additional logging to Class Verbose Log"
am: 243e73079f

Change-Id: I26e7cb64966ef84a722ef17103e79cc84e21737f