Merge "Minor logging fixes for new DHCP server" am: eb5f458884 am: eb3c27ce46
am: de5707b286

Change-Id: Ia3c7d7c88eb43197490c8eb2c3a66de12739407e