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