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

Change-Id: I235f68723215a806317828b65d9b8905598b10eb