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

Change-Id: I8a83b6fdf59aad7939eccc504a22178c2dab4854