Bug: 217231862 Bug: 194675064 Test: stress tests Change-Id: I88a782ee6aa5922aa9e52a53c6cff6e62f850a10