merge from froyo-plus-aosp

Change-Id: I8b8714eef0295bd5d731b3a0ef816392b1c51261