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

Change-Id: I066fef3a3a292e1c05cbe3283678cb9ab411753e