Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev
am: 1f44c26b1e  -s ours

Change-Id: I2c7de4484b78f31d83ae04c8e3c591e22d222689