Merge "test_stamp_pattern: cleanup class scope variable usage"