Merge "restore binary compatibility in TestAppInstallSetup"