Merge "[incremental] Manager, Storage and changes to Package Manager Service"