Merge "Add testBatchAndFlush to knownfailures." into mnc-dev