Issue #3016932 by deepanker_bhalla, RajabNatshah, israelshmueli: align code style with coding standards