Merge "old paths contains all entries when updating" into pi-dev
am: f5cb5e5525

Change-Id: I13b2118b834e9f255c83cf737ae1d9e8d93c9245