Bug: 64213593 Test: shutdown no timeout Change-Id: I5007e7cfc00ab22fce3b6ef13bacbcc951197b9e (cherry picked from commit 4d282544)