Merge "set zero shutdown timeout for eng build" am: 6fb2ef1d03
am: 5579d46471

Change-Id: I10fe8d29054c15220a4a354eb3629353d307cc9d