Execution plan validation added.

Change-Id: Icdc30e62f2d39d4b5f6c86fe5e9ee0e7483543aa