Merge "Add tests for DhcpErrorEvent" am: 367c758601
am: faef1f66ed

Change-Id: I9b65a2eef94567d2b79a9955619938e64906080d