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

Change-Id: I532f19e2ecc33ac6e78b9192f5abbd56d010e97e