Merge "Fixing flakiness in libfs_avb_internal_test"