merge from froyo-plus-aosp

Change-Id: I3f4633e25ceae621602c1e76c3da503a11ac51a8