merge from froyo-plus-aosp

Change-Id: Iad8617b45d406e7f737bf68ed723755363d27e9b