Merge "Fix for jira N_SE 45854 and N_SE 45823 Signed-off-by: vipul <vipul.kumar@samsu...