Fixup for 69d36e1f4b25988e2decdf470e86817e5735b669

Change-Id: I2e763158a877d3ee551a7a98c47bd2224e2f63c4