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

* commit '3d7a8dbc8324afaa4e9840e26df93593aa06447a':
  Fix structural class checks