Merge "Removing the ability to get native instrumentation as part of nav dump"