Merge "Fix fdsan error"
am: 9e46d1c996

Change-Id: Icdb178383be78ab4f2067de4e9be4b1260a4df07