Merge commit '569f2d10425338486d417694c8e19c4c33360e2d' into eclair-plus-aosp