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

Change-Id: Ia01ec63ef42441d8f1632a5b6280df2d8c52e41d