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

Original change: undetermined

Change-Id: I7c2d33226fc6b13abe213b554ed9cef8f52360e6