Merge "Revert "Check for out of bounds reads in ESQueue. Bug: 23221340""