merge from froyo-plus-aosp

Change-Id: I1c7b0ce913903088729cce23fa0e8f39c9e8c15d