Avoid ClassCastException when merging feature map changes

Bug: 538697
Change-Id: Ib39709fdc19a19da26040aa80a9310fe534f7727
1 file changed