Merge "Fix config change on secondary split adjustment" into rvc-dev am: 320ecaca3f am: 07c8e53be8

Change-Id: I2b7e0c0c3401d9c953dff0d5177cb7489706b781