Merge "powerstats: Add null checks to clients of power stats api" into sc-dev