merge from froyo-plus-aosp

Change-Id: Ie16c2a8d6465fb0b2d2a06027b29a6bbe4ff9d16