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

Change-Id: I748d223c4dcec4f0234b0e4e808ae982efbd0bd5