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

Change-Id: I05ab705e4cb08dc9f36bb37592b5cd741f0bfb94