Merge branch 'stable-3.9'

* stable-3.9:
  Use verifyZeroInteractions instead of verifyNoMoreInteractions
  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: Iccd58e067892db5839216153b178d8216de6953b