This was done in I7fd0b4f60, so removed the TODO comment. Change-Id: Icd43c00dacfa942aa94b40267af1cbf04e543470