ANG-9047 RC

Merging ANG-9047 fixes into 2.3.0-release-candidates.

Enyo-DCO-1.1-Signed-off-by: Aaron Tam <aaron.tam@lge.com>