merge from froyo-plus-aosp

Change-Id: Iec3c2022aaea07b09ff09bcb690331385b30584b