Merge "Assume successful delivery if no Message Status"
am: 94deb1ca38

Change-Id: I106db1010a847a23f5e007c65a677bde5562f56e