merge from froyo-plus-aosp

Change-Id: Ie8f2b137de580bfb23a1bdee513a8a20075e40a3