merge from froyo-plus-aosp

Change-Id: I64de22c97a98ec4f1f288c619e3d66d6be261c6d