split helper and fix build

Change-Id: Ie479d363152d3c6a109d6e924b09c155c79511c8