Merge "Fix the template parameter passed to some art::GetClassRoot uses." am: 19759b28 am: edd177ca am: 9242e089 Change-Id: I2a8e1e9f78016bc24a6bb27479ba22e23a8cdfa3