Merge "Fix lshal not to squash HAL entries incorrectly."