Fixups for failed stable backport of "Remove OTG DIV register write for Virtual"