Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev am: 153d2ff613
am: 53a3bcdb14

Change-Id: I2251834a0ef1c1d61e04d86602a6540a9a3d2b75