Merge "Fix FlakyTest annotation in TEST_MAPPING of mockingservicestests"