merge from froyo-plus-aosp

Change-Id: Ibbde24d8ee26259f3eff076ee4d32476f868db85