Merge "Improve summarized statistics" into oc-mr1-dev am: 8ecb66eb65
am: ea9037e691

Change-Id: Ic76ca11f742e1ea4a565e58a13683a69c15a9fab