Merge "Move GB SDK components to 2.3" into gingerbread