Merge "Shorten the timeout of DHCP INIT-REBOOT state." am: 29f5f861af

Original change: undetermined

Change-Id: Ia15239193be2685ac36da5a8fe13334900562ea0