[automerger skipped] Merge "Speed up the DHCP roaming tests." into rvc-dev am: f7642249 -s ours
am skip reason: Change-Id I6fc93f82fda6891b3973d04e30cdfce6563077a1 with SHA-1 bd2f2f26 is in history
Change-Id: I9ff89968bf441cca5d1e16de483993bbeba50e62