Merge "Query declaring class before querying IsNative." am: b4d1d7217c
am: 85b4c816b8

* commit '85b4c816b8b53b0b1339dda7b20200ea88d42fbc':
  Query declaring class before querying IsNative.