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

Change-Id: I940d92cac87d76f83930cf86c7b23fa37b354f3e