Merge "Skip test_stamp_pattern until bug 1664793 is fixed"