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

Change-Id: Ibf823cc8bd8353940c0d238d3a398f68fa930d86