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

Change-Id: Ib64cc0ba29ae09df2a60dcb45f79567367d510e5