Merge "Fix fdsan error" am: 9e46d1c996
am: f06aef8782

Change-Id: I2d64af2edc4a7315b906d4e9603fa957e27a4a30