Merge "Update fuelguage to use uid in AppInfo" into pi-dev