Merge branch 'stable-3.7' into stable-3.8

* stable-3.7:
  Deleting a project that has no entry shouldn't cause a split brain
  Fix compilation error for missing variable
  Fix CompileTimeConstant ErrorProne issue

Change-Id: Ib5f2475eca9a5f28c62e48c5c2ef5583ea157ead