Merge \\"DO NOT MERGE Skip emma instrumentation if we\\'re using jack.\\" into...
Merge \\"DO NOT MERGE Skip emma instrumentation if we\\'re using jack.\\" into nyc-dev am: 1f44c26b
am: 49fd8a24 -s ours
Change-Id: I9a51bcb269dc9554e1389a00cf75b95f9bb6bbe6