am ef9fd18d: Merge change 8616 into donut

Merge commit 'ef9fd18d90829ecbd37769cc05a8d5288aff821c'

* commit 'ef9fd18d90829ecbd37769cc05a8d5288aff821c':
  Fiddle with default densities to try to sanitize the API.