Add ability to switch to index ids late.
am: f3677471a5

Change-Id: I29a3dff3c76ea3d8d21a9b9f36b67c26ffc720c8