Fix Return Codes with recent values

Change-Id: I3490c753d4e36965dd1cb7b93021fcda6cc31ca4
Signed-off-by: senthil <senthil-b@hcl.com>
(cherry picked from commit 47f2a7905a3491f49811f987f2927f3121d855b1)

Change-Id: Ibcd608052101c975dcba8804b2728bb10591b1b0
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
Merge "Fix Return Codes with recent values" into stable/helium