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

Change-Id: I860f53f63df73291bb5be40668e4e4729597f933