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

Change-Id: I933f33fdb6fa5ecb3d09ad7838b8fcc062219a4b