Merge "Fix issue 3022800." into gingerbread