am d6b23e5c: Merge "Package garbage collection policy parameters into a single structure." into honeycomb

* commit 'd6b23e5ca90e011b6ede0d3592922616df3e33ec':
  Package garbage collection policy parameters into a single structure.