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

Change-Id: I2deda7bb163746fd2d2b3b17d63b8dfd8e27b7d2