Merge "update scenario test cases according to gating release"