Merge changes from topic "lazy-dumpstate"
am: 5c2a8265c6

Change-Id: I81b8c547d174a4becfb99ed0cb4e9fe53be1ac15