Merge "Avoid running of hooks when running MWTimestampTest"