Merge "SIP: clean up unused class and fields." into gingerbread