Merge "Only throw expected exception when coalescing fails." am: 9893a89dbe
am: b1db00938c

Change-Id: I9bd392327f162d088790f9b64aa072a753395bf9