Merge "Remove automotive restriction from enable/disableInterface"