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

Change-Id: Idc12d4e566d0211a5e0c8db778777721d8ddddb6