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

Change-Id: I78376154805b499d6137a73cd815132118e98fed