Merge "DO NOT MERGE Fix testVerifyStatsExternalConsistent case"