Merge commit 'f56f317f' into eclair-mr2-plus-aosp * commit 'f56f317f': Add support for dumping RS objects to aid in debugging of white blocks bug.