Merge "Fix cts failure on PinnedStackTests for waterfall"