[automerger skipped] Merge "Fix flakes in testMultipleProbes" into rvc-dev am: c0816168 -s ours
am skip reason: Change-Id Ica21c23af0472edc6ead123365b39e42e69f85cb with SHA-1 eb5bfa9b is in history
Change-Id: I8c436f9c7bd8944771c03baf63a5357ca35c9d78