merge from froyo-plus-aosp

Change-Id: I9bd45d66c9586b99635d7d05d1f351126bfc9840