Merge "Followup c17651/bug 39032"