Merge "Separate NetworkMonitor/framework portal URL" am: 8ab472e77a
am: afa7a43b17

Change-Id: Ic6c16ccf98e943b7003524f6e2b98e100e543221