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

Change-Id: If0e2b3e13a9b38fca9fe772166041ff37d1365a5