Follow-up to I285c0335c582882b5297a0506260ba97d45e76da

Change-Id: Ia1592248556b54d150ab8f320241778ad08bd8b9