Merge "Include more methods in SurfaceTrace." into nyc-dev