merge from froyo-plus-aosp

Change-Id: Ibe4e2029776429eea21c7ced877e21607e66504d