Fix for: BHV-10735

See Jira for information.

Enyo-DCO-1.1-Signed-Off-By: Cole Davis (cole.davis@lge.com)