Merge commit 'f71f068fb9082ad78c78493c1295074e88a5526c' into eclair-plus-aosp