Merge "Fix issue 3436738." into gingerbread