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

Original change: undetermined

Change-Id: I9f115ddecdcef88e6dc747a333746618857ef93a