merge from froyo-plus-aosp

Change-Id: I297edc39b1076522bb50ffa67e5ee02c3bf0a40c