This should limit the amount of spurious rebuilds. Change-Id: I6a6a6964b8ba2672c376d848f362f18a599c45d9