692dfafe02
Merge commit '880dfe4f675128188f8d598f2025a417ccabd1bf' into gingerbread-plus-aosp * commit '880dfe4f675128188f8d598f2025a417ccabd1bf': Fix issue 3007862