Merge "Overcome disconnect during oem override"