Merge "dump psi stat into bugreport" am: 373c5df15a am: 21409a7abc
am: 8d044461f0

Change-Id: I203344f730070265328e65deb8ebcbaa787e8684