Fixing a ClassCastException issue with an incorect Row to TypedClass cast introduced during the migration work.

Change-Id: I8d60a4029db7986e852821148c3e6e1b8a619959
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Merge "Fixing a ClassCastException issue with an incorect Row to TypedClass cast introduced during the migration work." into topic/schema