[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 skip reason: Change-Id I62d1ab6b94be1ee95fbaa2ecce62eaba01e7892d with SHA-1 fa33d49b is in history
Change-Id: Idd0cb60f13c520162379245330c727b15edd2b92