Merge "add missing part of patch" into jellybean