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

Change-Id: I73be22fce02d20c5009164787124770e62e180c2