Merge "Fix various not so benign fdsan errors."
am: ddfbb5f63c

Change-Id: I9e342e371ce88d1ed5055df5dc98f4aed3f60463