merge from froyo-plus-aosp

Change-Id: I9cede57e10df9d6ba411b2960a77d7b9b60a1489