Simplify ASI parsing.
Merge pull request #1315 from Microsoft/fidelityPort2

Fidelity port2