Merge "Merge "Avoid timing issue when executing case and doTraversal" into android11-tests-dev am: 3d9731f131" into android12-tests-dev