Fix last remaining comments for recently merged FeatCl. TrivialFix Change-Id: I80c43cd24c7d19739c23717e8ab833e87b819590