merge from froyo-plus-aosp

Change-Id: I5c020c7dd4e9b0629254ff027f11af484d47ba8c