Apply patch from SPF11.3.CSU1 to SPF11.4.CS

Change-Id: I2e48dca53ce544e28c26a08974a039450e847bdb
6 files changed