Follow up to I69868dca6e1f3e4a1bf123c9e7f1f3412162b264

Change-Id: I7812c4b66bac30648c00054381703e390671a821