cherry-pick fe0104041858046a0aa649c791869d7eb1a5c175 to froyo.

Change-Id: I9c95ebc6f735cb6abc2b0920c2274e0b5ce0ef70
2 files changed