Fix fallout

from e16c8534f446a7cc311d6d5026aae5457e4f8e6c

Change-Id: I05154dd06b062aaf7fdffe1aa3792f9710293021