merge from froyo-plus-aosp

Change-Id: I0b5605e2b1c31593dc31abd62e275d0602db46eb