Merge "No tombstones under normal bionic unit tests run." into main