Fixes ENYO-654 in 2.5

Updating 2.5 with PR #1837 

Enyo-DCO-1.1-Signed-off-by: Aaron Tam <aaron.tam@lge.com>