merge from froyo-plus-aosp

Change-Id: Ie085dd2e50a68bb79699f98d31ef8ceb0fe8d339