Merge "Assume successful delivery if no Message Status" am: 94deb1ca38 am: 05d08d1a1e am: b17cdd14c1
am: 5ded387636

Change-Id: Id890eb2ea2a69de6b8cf86e2a2f01bc1901af9ef