merge from froyo-plus-aosp - DO NOT MERGE

Change-Id: I5ddea1d56218732cf5cba16e0c8db18399b7f504