[automerger skipped] [automerger] Fix use-after-free in proxy resolver am: ed9838b89e am: cdc21af3ac am: 44ef83511e am: 46b849f363 am: cfac906e4e am: e15fe22832 am: 499cb16f25 -s ours am: 7c5877d8a9 -s ours
am: 11f967ed7e -s ours
am skip reason: change_id I663829a8a7467f50f9b11fd8b787108ff5d64acc with SHA1 061a73bd2d is in history

Change-Id: Idcf943c047dc0e7c4d97fdd6c1c7d79cd8855222