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