Merge "Add a function to construct the GRSurface in test"
am: ee9c65a38e

Change-Id: I77cdb9e53a1ac44ba9bd23bb408d3154e50f1778