am cb44b4d4: am a1b02556: Merge change I3134655d into eclair

Merge commit 'cb44b4d475500b4a2ced729ae64d6d87f46f09b7' into eclair-mr2-plus-aosp

* commit 'cb44b4d475500b4a2ced729ae64d6d87f46f09b7':
  More capabilities for default home configuration