Merge "Fix GLM and SGLM tests for API 15" into nyc-mr1-dev