[automerger skipped] Merge "Enable DHCP INIT-REBOOT state on R." into rvc-dev...
[automerger skipped] Merge "Enable DHCP INIT-REBOOT state on R." into rvc-dev am: 7b486419 am: 251bbe02 -s ours
am skip reason: Change-Id I62d1ab6b94be1ee95fbaa2ecce62eaba01e7892d with SHA-1 fa33d49b is in history
Change-Id: Ib31f70998d903c54c653fb8b21b6b2adeee28d7f