Merge branch 'stable-2.9' into stable-2.10

* stable-2.9:
  Avoid throwing exception due to deleted change

Change-Id: I87fc07bd38aa07a02609d5d24afa101366f42406
tree: ee0d9384d7259b05ad924e5d61f10dd6eb034d06
  1. .settings/
  2. src/
  3. .gitignore
  4. BUCK
  5. LICENSE