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

Change-Id: Ib77887238935225bda9457414b9ec5a41e6919d6