merge from froyo-plus-aosp

Change-Id: I42dc1a2946b44b870f4fbf21522c20974e8dfd39