merge from froyo-plus-aosp

Change-Id: I58f1d905b3fa781e4f5827d4d7b9323a4cdcc04e