Merge "Use service info instead of app info and revamped data parsing"