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

Change-Id: I1699c0f52c328cc7adc97b216b00adf450437085