Merge "Fixed an issue in the contrast calculation" into oc-dev am: 9bf5c0c3e1 am: ff122e750c
am: e7cf8bc21d

Change-Id: I08e2f6d66ccd51b846bb3a2f7c4dfb28e9f9662c