Fix missing sub features if the first data point is notFound Test: Manual Change-Id: If18302297c988e844bd0015fea0a336a334a7359