pr-8793-467163 vs. 5.0-12294 / sw-lin-mesa / sms-gc

pr-8793-467163 (46716337) Diff 5.0-12294 (695a9649)
Failure 542262e8fafc5179265ab79a8a140f6f404dd2c6
Failure f8f227e155bb73c479e1a29f125c1b0e088cdec6
Failure f8f227e155bb73c479e1a29f125c1b0e088cdec6
Failure 31619ccf0c3fd7ed0ee761a187748b6726d92f52