Merge "Update behavior of commits not upstreamed to include pure deletions" am: 97bd347fcf
am: 64a6611cd4

Change-Id: I95b4ed47ab4f671a05803e398bc234d1bf9d6b9e