am bb8c910f: am d2e4a166: Merge "Remove dead path code"

* commit 'bb8c910fc12f304c97c94ee86a3a3da56afe8374':
  Remove dead path code