Merge "Clear indexing before adding all Slices" into pi-dev
am: 842ea91baa

Change-Id: I6a1a0903ac0e7538e013eebe6071d1b7ff496412