Merge "powerstats: Add NFC, PCIE, WIFI stats" into sc-dev