Tweaks to Get Started with Send Receive

Change-Id: Ifccd7b24d74d9982e53bd397b34578b2e7324482