Merge "Ask netd to swap stats map before reading" into qt-dev