Update OCMIndex fixes FWNX-1160

Change-Id: I2303465ecc7c35639c4544c9dcb6076a83684afd