Merge "Fix config change on secondary split adjustment" into rvc-dev am: 320ecaca am: 6753d82e am: 662a2e1d am: 9113efe7 Change-Id: Icd12fdcd1f8c3ca6c0b8b0db6eb09da87185601d