Merge "Fix for NetworkStats/Telephony deadlock" into qt-dev am: fcc3c44d88
am: 25d80e7b5c

Change-Id: Ie16a24390bce23a22b63975fb0bcecfac7990779