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

Change-Id: I02c0efc4ae2a4de90d2f0d04a781277ebd881327