Merge commit 'c679a30dd2902cd59a38d293df064e07faa3abd1' into eclair-mr2-plus-aosp * commit 'c679a30dd2902cd59a38d293df064e07faa3abd1':