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

Change-Id: I41d8577da4a6ca93252027bd85ee632decaae56f