merge from froyo-plus-aosp

Change-Id: I54a4dcd22ae171120e95fbe82fd5e4001dfe05fc