[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 -s ours am: e762093d -s ours
am skip reason: Change-Id I62d1ab6b94be1ee95fbaa2ecce62eaba01e7892d with SHA-1 5b129a63 is in history
Change-Id: I49a278cd591b97f794faa8e4c085e5e7a0e33cc4