[automerger skipped] Merge "old paths contains all entries when updating" am: 600aeb124b  -s ours am: 89e9a1ad43  -s ours
am: e295a0e4e3  -s ours

Change-Id: If1377d662d0c668cef6269f464e496a9566b1c2c