Merge "Remove some more dead-code from old split impl" into rvc-dev am: e68c8ac0 am: c8b8ac25 am: 9febd5a2 Change-Id: Id36c4cb41a3ef6a75810ed1d1ea25e7934dc5ebf