merge from froyo-plus-aosp

Change-Id: I1a3c106234a7910194fe39ca17339796aaf5cfe1