Refactor IP connectivity event logging am: cfddd68792
am: 17427c9770

Change-Id: If8775031f2a293e94e564dde502d0775d5808fe6