merge from froyo-plus-aosp

Change-Id: I2143b0ab6c94047d36d83a734985e9dfa67efda3