Merge changes I858017b8,Ife32b600 into oc-dev

* changes:
  Improved the media color extraction algorithm
  Fixed broken coretests