am 88adf363: Merge "Fix broken runtime SetStatsEnabled logic"

* commit '88adf36315237947d3a5d10b28fdf8b9da7794a4':
  Fix broken runtime SetStatsEnabled logic