Merge "updated stat_ in frameworks"