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