Merge "Follow up to I15baa5b1d19324521070d641ae6a227d782a4e9e"