Merge "Remove some more dead-code from old split impl" into rvc-dev am: e68c8ac0 am: c8b8ac25 am: 8c4fd65f Change-Id: Icf027270b50f33e33e49f7c08a910701bdd481da