merge from froyo-plus-aosp

Change-Id: I645257a4f11e9f14f2158ae28ad04d1597b79ef9