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

Change-Id: Ia5ce4f360f7837ccf1256142a545982c1096a7bd