Merge "Add netstats and location permissions support for RIDL/LogKit II"