Merge "Pass object instead of class to instanceof entrypoint"
am: 78edc92a8e

Change-Id: I14915fbb01120685f7922d45e63fceaccdd998b5