Merge "Remove development-only code." into gingerbread