Merge "Update behavior of commits not upstreamed to include pure deletions"