Checkin
Tweaks to stabilize the runtime operation of the sample.
Revert to a more stable baseline.