Fixing progran validation issues

Change-Id: I080ef2783317f1d2c7a7b36886a4e68c99bd4287
5 files changed