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

Change-Id: I9f1dc8c2c6d2ad461efc2722a5b1829f753dfcd4