Inactive notification count and indices were off. Change-Id: I6e8555fe7dcaf6e7f999f09fb4cda56622928b07