Don't cast LegacyAdapter to NonLegacyAdapter

Bug: 20681571
Change-Id: I32a8e9df31eead4068ceb7c7c39b07f7144fee91
(cherry picked from commit e48aefc4022ceca71401d1490b595a8f71e95611)
1 file changed