Merge commit '926780b023a09d37e8dcf1fabf6fa990f042f06d' into eclair-plus-aosp * commit '926780b023a09d37e8dcf1fabf6fa990f042f06d': DO NOT MERGE