Merge branch 'stable-2.16'

* stable-2.16:
  IndexEventHandler: Split delete change event in its own task
  Fix delete change event propagation
  Format java files with google-java-format 1.6

Change-Id: I0ca36b54fd192316b5011a7b5551c3c3d158d9a7