Merge "Disable on demand process stats implementation." am: ee2aaba53f am: ebb6ebee7b
am: 9833deeb8b

Change-Id: I1e4ed872e6672af80d19517340a1229b13187345