Merge "Update gfxstats cts test" into mnc-dev