Merge commit 'd29e6861717a4e762050eb5a30169729e205d651' into gingerbread-plus-aosp * commit 'd29e6861717a4e762050eb5a30169729e205d651': Fix bug 3058324