Fix for ENYO-3125

See commit message.

Enyo-DCO-1.1-Signed-off-by: Cole Davis <cole.davis@lge.com>