Merge "Fix out set parameters success return code" am: bbfc1b857c am: a852bbd2fa am: 7cab58d048

Change-Id: Ieab90756a0a16c4b514bf40b2bd9501008fe057e