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

Change-Id: Ice72e01f1ce2a38739c4306b9df4ab33bc16b2c9