Actually fix build breakage with cleanspec. am: 319b8292be am: b16a4d26d3
am: 6ad2f6c984

Change-Id: I09a208dcd24cf17d3171ed5d4f64282a2642dd56