* stable-2.14: Remove duplication between both index modules Change-Id: Ib30f3e05af9520001eb9cf2724e5cc1a0e58fb55