Merge commit 'ae0bb04aa4b26abd27dd127ea35a6b3cd21caeac' into gingerbread-plus-aosp * commit 'ae0bb04aa4b26abd27dd127ea35a6b3cd21caeac': Fix issue 3098850
Merge commit 'ae0bb04aa4b26abd27dd127ea35a6b3cd21caeac' into gingerbread-plus-aosp * commit 'ae0bb04aa4b26abd27dd127ea35a6b3cd21caeac': Fix issue 3098850