ENYO-435 Resolve conflicts with master again

Enyo-DCO-1.1-Signed-off-by: David Um david.um@lge.com