merge from froyo-plus-aosp

Change-Id: I6c6ee9c9567f5aef7e1beb585296c1e2fb884e9a