merge from froyo-plus-aosp

Change-Id: If7ea7cb45a74560ef46f771e25b75a1c03417f27