Follow up to change 61699

Change-Id: I0ded9938fcdfeffdcc77f61830619e1accdd68e3