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

Change-Id: I04ce2701a92c3863dc705eea616bb87aec257690