Merge commit '4986934e189032dba43676973038879b5f90a406' into eclair-mr2-plus-aosp * commit '4986934e189032dba43676973038879b5f90a406': Remove the IM provider contract class.
Merge commit '4986934e189032dba43676973038879b5f90a406' into eclair-mr2-plus-aosp * commit '4986934e189032dba43676973038879b5f90a406': Remove the IM provider contract class.