Merge "Target API check for margin params fix" into nyc-mr1-dev
am: 828d4ff61d

Change-Id: Id289f1e8c41b02f76659aa04bed654f36e3aca9b