Merge "Make skip_tracker bug keyword detection more robust."