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

Change-Id: Id8035630140f34cdf8f5d779935be7fe92e442b4