Merge "Handle invalid destination address gracefully" am: a753dfd2e8
am: 825345628c

Change-Id: I68f8125a3f69bd5bd13e5ef1615e58ae55ad7d77