am fa0394c9: Merge change I715333b8 into eclair

Merge commit 'fa0394c9f89f13b53c6db2470253825b88cafb64' into eclair-plus-aosp

* commit 'fa0394c9f89f13b53c6db2470253825b88cafb64':
  Add support for dumping RS objects to aid in debugging of white blocks bug.