Merge "Revert "Temporary Changes for certification of SCO."" into honeycomb