Merge changes I70f61fe3,I00376b02
am: f81f596c58

* commit 'f81f596c586dd0de32d336468e22e6fef8257f9b':
  Revert "ProfilingInfo roots should be visited by the declaring class."
  Revert "Query declaring class before querying IsNative."