Merge commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9' into eclair-mr2-plus-aosp * commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9': The vendor is about to check in a fix for this issue, the workaround is no longer needed
Merge commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9' into eclair-mr2-plus-aosp * commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9': The vendor is about to check in a fix for this issue, the workaround is no longer needed