Only the subclasses should be instantiated. Co-Authored-By: Tim Burke <tim.burke@gmail.com> Change-Id: I9b90863bb502ca8b95e626e83775475c352a7a4d Related-Change: I21292e7991e93834b35cda6f5daea4c552a8e999