Merge "Add instruction to index classes auto-gened from proto." into tm-mainline-prod