merge from froyo-plus-aosp

Change-Id: I85cd0e3207b09b81e41f15d85cd1c900a6bb56b3