Merge "Remove old location classes." into gingerbread