This fixes an issue caused by the fix for #19658. Change-Id: I688275b0c39af723500bc0f7d0c87799698c90e7