Merge commit '2d319172300af10e139818ea367c4afc14c616f5' into eclair-plus-aosp * commit '2d319172300af10e139818ea367c4afc14c616f5': Temporary patch for issue 2419260.