merge from froyo-plus-aosp

Change-Id: Ib618f0dc9c71938d111648043ebd2fa2b93beda1