Merge "Fix config change on secondary split adjustment" into rvc-dev am: 320ecaca3f am: 07c8e53be8 am: 6c234c6ecb am: 3b0ac26b9e am: 948af6a6b0

Change-Id: I78d4e814232e4764088d2c088fc65ea09bcfee86