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

Change-Id: I25304e622a3a28191c74974fa9a0a91e8f7cb4ae