Blind fix for spurious -Werror=clobbered

Change-Id: I724713927f181251e8f4a5be7887c49e6dc6edda