Merge "Fix GAL lookup for provisioned EAS accounts" into froyo