Change-Id: I02c5d57db9ffb854b096c9382d740923e9cc3b89
(cherry picked from commit 0f98a035)

dynamic_cast of this to the type is already is

(cherry picked from commit 004b0268)