Merge "Enable more logs for networking" am: f3736d67f8 am: 310609b8be
am: d33e31e27a

Change-Id: Icd81490cabaaf1d164ce77bda76b196b869c8721