Refs #58282

(cherry picked from vlc commits
 06b9bc0acd314f79fdd03d9f0571dbf20319b5cf
 8aa887870319cc0089f781b6ecd332ae7af5c02c
 b0f1df3988938b37dd04649918f3c70465299dd5)

Change-Id: Icbf887f35eded1b2abf36b464ccbeb1de497b02b