Merge "Remove some more dead-code from old split impl" into rvc-dev am: e68c8ac0 am: 42f14d54 am: e4e3b624 Change-Id: I442ceba1eba102f7ab16b0308e60d2dac106ab1a