merge from froyo-plus-aosp

Change-Id: I54d3b035f378d92f287b3dd08987c4041fda9997