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

Change-Id: Ic8ef008ec4df52fbe9d425c6ea3db728b0b40324