merge from froyo-plus-aosp

Change-Id: I1f4c76c89aad748b006cfc1370a767782e4ca3e7