Merge "New SDK architecture. DO NOT MERGE." into gingerbread