Fix more NPE on CM feature contexts

Change-Id: I5fa1cfc344883e86862a88e2775c3a1a01b63f3a