Target API check for margin params fix am: 2dd20a61e9
am: 6efd207022

Change-Id: Ic05edff9014a74cd543d0eef03ba8862a198613a