Merge "Suppress StopInfo exception based on target API." into nyc-dev