Merge "Revert "Handle the new app source certificate""