am ecae8a43: am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread