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

Change-Id: Id9fbc2ad91d6e337be7e39ab747187427e69003f