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

Change-Id: Idaef598fff95e2e8d384d6b427529956dd3b94b9