De-flake 1336-short-finalizer-timeout am: d19ee63409 am: dbae123c0c
am: 7e74f32c98

Change-Id: I23903c6a341655694b44987927041c4384587739