pr-12972-34db4f vs. 2407-117 / ogl-lin-mesa / sms-coconut-drinks

pr-12972-34db4f (34db4f94) Diff 2407-117 (8a50676b)
8b0a4fbc6ba56201b7ba3f9e152fc2b6556bb158 Waiting for diff... 57afdc2bb0c9731a34bdaa817d2be3147479e4cd
1bb7398360594173da208fdd54cca16553ab02f8 Waiting for diff... f9400b0296301032fdb01ae0dd8df53b79b64a28
4eafd3bb014168ba7208961132debd02b178420e Waiting for diff... 0587883d3cd63cde739d568cb839f4b250dd4359