Merge "Remove p2 download cache from repo"