Merge "Include network type that caused broadcast." into jb-mr1-dev am: 976942a8ee

Original change: undetermined

Change-Id: I200833519100685474c282353239b5818374dbec