Merge "Add sanity checking to declaring class visiting"
am: 1a9018b

* commit '1a9018ba74841ac507b96f0e0dd6b86b22778ca6':
  Add sanity checking to declaring class visiting