Merge "Handle invalid destination address gracefully" into oc-dr1-dev
am: 93ea43386e

Change-Id: I0e36a295ca481bb5c9b0fc77cb0d2e56d9cbfd0c