Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread