Merge "Separate NetworkMonitor/framework portal URL" am: bcd3bed561
am: 34198fac89

Change-Id: Ic6c16ccf98e943b7003524f6e2b98e100e543221