Merge "Fix STK CTS test failure" into marshmallow-cts-dev