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

Change-Id: Ie23f6aae28f3452623523855a030f6fb30a4b6fd