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

Change-Id: Iff4a38dcb6df89f661b9eb7d2bcd33af46d4388c