8a4e36a027
A follow-up to commit cd3fcafbbe38853163de9214b6e91110dae7c672. Change-Id: Ib11be7dae2056f77115ce21ef833f56fef474452