Merge "Fix self-test for JitterVerification test case" into mnc-dev