Merge "SPF2018-K4.19 : Retain K4.9 cpubw settings"