Merge "Merge "Reset callNetworkType and CallQuality after calls" am: 5819a337 am: dd0e480a am: e7e95b69"