merge from froyo-plus-aosp

Change-Id: Icd2fa05c77fd2ec7c878520647e0024bf89b0504