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

Change-Id: Ib45e499e3bf76e02c1112e113eac4fc04dffcda4