am b774f261: am ff3b3ade: Merge "Revert "Temporary Changes for certification of SCO."" into honeycomb

* commit 'b774f261ea63c44ec70b5d337b19368269800a06':
  Revert "Temporary Changes for certification of SCO."