Splitter wip: boilerplate change

Change-Id: I55d420160127ee606753e86c9f5656e80879565e