am a7aca39c: am 8d7955dc: Merge change Ie3f5cd4a into eclair

Merge commit 'a7aca39c5b9d8cd626b30fb4f2e6f304163373ca'

* commit 'a7aca39c5b9d8cd626b30fb4f2e6f304163373ca':
  Clean steps for a product configuration change.