Merge "Decrease number of network logging notifications shown" into oc-dev am: 11fbd2148f
am: 1c35c0cbbc

Change-Id: Icbe6b1db4e86e0bae2e112a406a3411f322c2adf