Merge "Fix a use-after-free found by HWAsan."
am: 82cf8de1f3

Change-Id: I74e90250ec2e1d90da89c16de77925044f55cb1c