merge from froyo-plus-aosp

Change-Id: I9b650562cac7b29c56204261a285b3a865c0dd9f