Additional scenarios that result in missed commits

More complex scenarios showing problems with how searching for previous
commits that should be carried on import miss certain changes.

Change-Id: I830e55933ca87ce41cdd7f474b30ea083d313089
Merge "Additional scenarios that result in missed commits"