Cherry pick IndexListAdapter fix into i-dev
am: 85a683d0b0

Change-Id: I588f244761c785f36431456e6d9f5e6e96414f7b