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

Change-Id: I14fb9f2c9e8bcb4da75bd289e036d31cdf6827b7