merge from froyo-plus-aosp

Change-Id: Ica7f3076728f549ce94dd90584bdc24ee84ced15