am 8d7955dc: Merge change Ie3f5cd4a into eclair

Merge commit '8d7955dcefec28bf86121e693355bcea882665c3' into eclair-plus-aosp

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