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

Change-Id: I17cbc0a91b65d755965ac4479d7656a7dbeef109