Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo.

Change-Id: Iaad92f99883c868d71d0cb17c115811e017994e4
2 files changed