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

Change-Id: I266d5418e4a53d5f5b9954ee83758eb9c373f458