Changes from wavss_a_dcl code review, clean up nan result set compare and parser.

Change-Id: Ib73e1f1aea8edb5119d4a97d2e41d570d7a4302f