am 16e3d1e2: am 362131b2: (-s ours) am 8098cada: am 65d17059: Merge "Refactoring subclass searching functionality." into studio-1.4-dev automerge: ba6e5bd automerge: 9cfd957

* commit '16e3d1e214dd3ae80346e37a9aee13baab0c399c':