Fix Return Codes with recent values

Change-Id: I3490c753d4e36965dd1cb7b93021fcda6cc31ca4
Signed-off-by: senthil <senthil-b@hcl.com>