Merge commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8' into gingerbread-plus-aosp * commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8': Fix issue 3022800.
Merge commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8' into gingerbread-plus-aosp * commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8': Fix issue 3022800.