Merge "Fix GAL lookup issue" into froyo