Merge "Merge "Tear down agent after preflight rejection" into oc-dr1-dev am: 47303ec66b am: 19bb6c35ca"