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

Change-Id: Ibd76868a5620ecd95fff882a4e4b0e58471b741e