am 21afaa73: am 3d7a8dbc: am 9ed8be67: Merge "Fix structural class checks"

* commit '21afaa73cb98bf8905a4887c8e3c5f8a7f2fb98c':
  Fix structural class checks