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

Change-Id: Ic93f722459de8da30b9b2f8971dfd0b650e37f10