ANG-11640: applies fix for BHV-11689 to 2.3

Enyo-DCO-Signed-off-by: Ryan Duffy <ryan.duffy@lge.com>