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

Change-Id: Id831cef2f90ad39537975d31407f00b2f768d59e